wayland-device: Handle v2 of seat

diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index aa879b36e3c98a5f45b5ffc9e5a5a9c8077331cb..72395d1d45dda72ca9b6089597ffd5e5fe1efe0e 100644 (file)
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -1583,8 +1583,17 @@ seat_handle_capabilities (void                    *data,
     }
 }
 
+static void
+seat_handle_name (void                    *data,
+                  struct wl_seat          *seat,
+                  const char              *name)
+{
+  /* We don't care about the name. */
+}
+
 static const struct wl_seat_listener seat_listener = {
   seat_handle_capabilities,
+  seat_handle_name,
 };
 
 static void

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index ee8e903f388b45be276f8921885dbca78d2d69f2..2f13b0cc5b6e3b24180f2f3e72faa9d505720d0b 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -171,7 +171,7 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id
       wl_registry_bind(display_wayland->wl_registry, id, &wl_output_interface, MIN (version, 2));
     _gdk_wayland_screen_add_output(display_wayland->screen, id, output, MIN (version, 2));
   } else if (strcmp(interface, "wl_seat") == 0) {
-    seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 1);
+    seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 2);
     _gdk_wayland_device_manager_add_seat (gdk_display->device_manager, id, seat);
   } else if (strcmp(interface, "wl_data_device_manager") == 0) {
       display_wayland->data_device_manager =